From: kfraser@dhcp93.uk.xensource.com Date: Mon, 19 Jun 2006 10:44:25 +0000 (+0100) Subject: [XEN] Rename show_registers() to show_execution_state(). X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15921^2~33 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=02e433d84609ec708e29e4d10253b034168c4609;p=xen.git [XEN] Rename show_registers() to show_execution_state(). This makes more sense since it dumps stack as well as registers. show_registers() still exists; it simply doesn't dump the stack any more. Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c3eb12f847..199ad50b72 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -306,6 +306,12 @@ void show_stack_overflow(unsigned long esp) #endif } +void show_execution_state(struct cpu_user_regs *regs) +{ + show_registers(regs); + show_stack(regs); +} + /* * This is called for faults at very unexpected times (e.g., when interrupts * are disabled). In such situations we can't do much that is safe. We try to @@ -327,7 +333,7 @@ asmlinkage void fatal_trap(int trapnr, struct cpu_user_regs *regs) watchdog_disable(); console_start_sync(); - show_registers(regs); + show_execution_state(regs); if ( trapnr == TRAP_page_fault ) { @@ -390,7 +396,7 @@ static inline int do_trap(int trapnr, char *str, DEBUGGER_trap_fatal(trapnr, regs); - show_registers(regs); + show_execution_state(regs); panic("CPU%d FATAL TRAP: vector = %d (%s)\n" "[error_code=%04x]\n", smp_processor_id(), trapnr, str, regs->error_code); @@ -482,7 +488,7 @@ asmlinkage int do_invalid_op(struct cpu_user_regs *regs) if ( unlikely(!guest_mode(regs)) ) { DEBUGGER_trap_fatal(TRAP_invalid_op, regs); - show_registers(regs); + show_execution_state(regs); panic("CPU%d FATAL TRAP: vector = %d (invalid opcode)\n", smp_processor_id(), TRAP_invalid_op); } @@ -511,7 +517,7 @@ asmlinkage int do_int3(struct cpu_user_regs *regs) if ( !guest_mode(regs) ) { DEBUGGER_trap_fatal(TRAP_int3, regs); - show_registers(regs); + show_execution_state(regs); panic("CPU%d FATAL TRAP: vector = 3 (Int3)\n", smp_processor_id()); } @@ -791,7 +797,7 @@ asmlinkage int do_page_fault(struct cpu_user_regs *regs) DEBUGGER_trap_fatal(TRAP_page_fault, regs); - show_registers(regs); + show_execution_state(regs); show_page_walk(addr); panic("CPU%d FATAL PAGE FAULT\n" "[error_code=%04x]\n" @@ -1356,7 +1362,7 @@ asmlinkage int do_general_protection(struct cpu_user_regs *regs) DEBUGGER_trap_fatal(TRAP_gp_fault, regs); hardware_gp: - show_registers(regs); + show_execution_state(regs); panic("CPU%d GENERAL PROTECTION FAULT\n[error_code=%04x]\n", smp_processor_id(), regs->error_code); return 0; diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index d6afff2ab4..8a4cd31a07 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -68,8 +68,6 @@ void show_registers(struct cpu_user_regs *regs) "ss: %04x cs: %04x\n", fault_regs.ds, fault_regs.es, fault_regs.fs, fault_regs.gs, fault_regs.ss, fault_regs.cs); - - show_stack(regs); } void show_page_walk(unsigned long addr) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 3e416542f1..bbc4d075b9 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -21,7 +21,7 @@ #include -static void __show_registers(struct cpu_user_regs *regs) +void show_registers(struct cpu_user_regs *regs) { struct cpu_user_regs fault_regs = *regs; unsigned long fault_crs[8]; @@ -70,12 +70,6 @@ static void __show_registers(struct cpu_user_regs *regs) fault_regs.gs, fault_regs.ss, fault_regs.cs); } -void show_registers(struct cpu_user_regs *regs) -{ - __show_registers(regs); - show_stack(regs); -} - void show_page_walk(unsigned long addr) { unsigned long pfn, mfn = read_cr3() >> PAGE_SHIFT; @@ -128,7 +122,7 @@ asmlinkage void do_double_fault(struct cpu_user_regs *regs) /* Find information saved during fault and dump it to the console. */ printk("************************************\n"); - __show_registers(regs); + show_registers(regs); show_stack_overflow(regs->rsp); printk("************************************\n"); printk("CPU%d DOUBLE FAULT -- system shutdown\n", smp_processor_id()); diff --git a/xen/common/domain.c b/xen/common/domain.c index 48a2b32162..89d5b793b4 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -234,7 +234,7 @@ void __domain_crash(struct domain *d) { printk("Domain %d (vcpu#%d) crashed on cpu#%d:\n", d->domain_id, current->vcpu_id, smp_processor_id()); - show_registers(guest_cpu_user_regs()); + show_execution_state(guest_cpu_user_regs()); } else { diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 433efcd6ee..aea0f1a787 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -90,7 +90,7 @@ static void show_handlers(unsigned char key) static void dump_registers(unsigned char key, struct cpu_user_regs *regs) { printk("'%c' pressed -> dumping registers\n", key); - show_registers(regs); + show_execution_state(regs); } static void halt_machine(unsigned char key, struct cpu_user_regs *regs) diff --git a/xen/include/asm-ia64/debugger.h b/xen/include/asm-ia64/debugger.h index 2b895cb1c7..d242f21b88 100644 --- a/xen/include/asm-ia64/debugger.h +++ b/xen/include/asm-ia64/debugger.h @@ -41,6 +41,7 @@ #include void show_registers(struct cpu_user_regs *regs); +#define show_execution_state show_registers // NOTE: on xen struct pt_regs = struct cpu_user_regs // see include/asm-ia64/linux-xen/asm/ptrace.h diff --git a/xen/include/asm-ia64/vmx.h b/xen/include/asm-ia64/vmx.h index e25e471225..5ebe44d814 100644 --- a/xen/include/asm-ia64/vmx.h +++ b/xen/include/asm-ia64/vmx.h @@ -42,6 +42,7 @@ extern int ia64_hypercall (struct pt_regs *regs); extern void vmx_save_state(struct vcpu *v); extern void vmx_load_state(struct vcpu *v); extern void show_registers(struct pt_regs *regs); +#define show_execution_state show_registers extern int vmx_build_physmap_table(struct domain *d); extern unsigned long __gpfn_to_mfn_foreign(struct domain *d, unsigned long gpfn); extern void sync_split_caches(void); diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index 088da65167..61ad981399 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -132,7 +132,7 @@ extern unsigned int opt_hvm_debug_level; #define __hvm_bug(regs) \ do { \ printk("__hvm_bug at %s:%d\n", __FILE__, __LINE__); \ - show_registers(regs); \ + show_execution_state(regs); \ domain_crash_synchronous(); \ } while (0) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 79c683d6ff..75d0772fef 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -531,6 +531,7 @@ extern always_inline void prefetchw(const void *x) void show_stack(struct cpu_user_regs *regs); void show_stack_overflow(unsigned long esp); void show_registers(struct cpu_user_regs *regs); +void show_execution_state(struct cpu_user_regs *regs); void show_page_walk(unsigned long addr); asmlinkage void fatal_trap(int trapnr, struct cpu_user_regs *regs);